From 03b2f00fec9ebbc574bcd1a14ec64c41066c55fc Mon Sep 17 00:00:00 2001 From: "djm@kirby.fc.hp.com" Date: Tue, 14 Jun 2005 17:48:48 +0000 Subject: [PATCH] bitkeeper revision 1.1709.1.6 (42af188067osLjX0T63Zb45JU4Zd2w) Enable dom_mem_ops on XEN/IA64 Signed-off-by Kevin Tian --- xen/arch/ia64/hypercall.c | 3 +-- xen/common/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/xen/arch/ia64/hypercall.c b/xen/arch/ia64/hypercall.c index 64947ac59c..5a80855c7c 100644 --- a/xen/arch/ia64/hypercall.c +++ b/xen/arch/ia64/hypercall.c @@ -126,8 +126,7 @@ ia64_hypercall (struct pt_regs *regs) break; case __HYPERVISOR_dom_mem_op: - /* regs->r8 = do_dom_mem_op(regs->r14, regs->r15, regs->r16, regs->r17, regs->r18); */ - /* we don't handle reservations; just return success */ + regs->r8 = do_dom_mem_op(regs->r14, regs->r15, regs->r16, regs->r17, regs->r18); regs->r8 = regs->r16; break; diff --git a/xen/common/Makefile b/xen/common/Makefile index ee312fde92..892d407585 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -1,8 +1,8 @@ include $(BASEDIR)/Rules.mk -ifeq ($(TARGET_ARCH),ia64) -OBJS := $(subst dom_mem_ops.o,,$(OBJS)) +ifeq ($(TARGET_ARCH),ia64) +#OBJS := $(subst dom_mem_ops.o,,$(OBJS)) OBJS := $(subst grant_table.o,,$(OBJS)) endif -- 2.30.2